Merge branch 'batman'
authorJo-Philipp Wich <[email protected]>
Thu, 18 Apr 2013 16:48:58 +0000 (18:48 +0200)
committerJo-Philipp Wich <[email protected]>
Thu, 18 Apr 2013 16:48:58 +0000 (18:48 +0200)

Trivial merge